Add gnome-shell-full target

This basically drops gir-repository, but pulls in GTK+ and stack.

TODO on this - we need to patch GTK+ to (possibly optionally)
pull in stuff like pixbuf loaders and themes from the system as well.

https://bugzilla.gnome.org/show_bug.cgi?id=610993

diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index 649dfd07fa44c3f38599f55de364125baaf8bf67..1b3cc69a007923533582cd4cb3917c2936a47186 100644 (file)
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -14,6 +14,35 @@
     <branch repo="git.gnome.org" module="gobject-introspection"/>
   </autotools>
 
+  <autotools id="glib">
+    <branch repo="git.gnome.org" module="glib"/>
+  </autotools>
+
+  <autotools id="atk">
+    <branch repo="git.gnome.org" module="atk"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pango">
+    <branch repo="git.gnome.org" module="pango"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk+">
+    <branch repo="git.gnome.org" module="gtk+"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gir-repository">
     <branch repo="git.gnome.org" module="gir-repository"/>
     <dependencies>
@@ -35,8 +64,10 @@
     <branch repo="git.clutter-project.org" module="clutter" revision="clutter-1.0"/>
     <dependencies>
         <dep package="gobject-introspection"/>
-        <dep package="gir-repository"/>
     </dependencies>
+    <after>
+      <dep package="gir-repository"/>
+    </after>
   </autotools>
 
   <autotools id="gconf" autogenargs="--disable-defaults-service">
@@ -46,21 +77,36 @@
   <autotools id="mutter" autogenargs="--with-clutter">
     <branch repo="git.gnome.org" module="mutter"/>
     <dependencies>
-      <dep package="gir-repository"/>
       <dep package="clutter"/>
       <dep package="gconf"/>
     </dependencies>
+    <after>
+      <dep package="gtk+"/>
+    </after>
   </autotools>
 
   <autotools id="gnome-shell">
     <branch repo="git.gnome.org" module="gnome-shell"/>
     <dependencies>
         <dep package="gobject-introspection"/>
-        <dep package="gir-repository"/>
         <dep package="mutter"/>
         <dep package="gjs"/>
         <dep package="gconf"/>
     </dependencies>
   </autotools>
 
+  <metamodule id="gnome-shell-using-gir-repository">
+    <dependencies>
+        <dep package="gir-repository"/>
+        <dep package="gnome-shell"/>
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="gnome-shell-full">
+    <dependencies>
+        <dep package="gtk+"/>
+        <dep package="gnome-shell"/>
+    </dependencies>
+  </metamodule>
+
 </moduleset>

diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell
index 97c13668b01f150037ae7a1387053b094de3c473..f30c5400b01e1c04ebdbdf8423a8e24d9df7d563 100644 (file)
--- a/tools/build/jhbuildrc-gnome-shell
+++ b/tools/build/jhbuildrc-gnome-shell
@@ -20,7 +20,9 @@ build_policy = 'updated'
 
 moduleset = 'http://git.gnome.org/browse/gnome-shell/plain/tools/build/gnome-shell.modules'
 
-modules = [ 'gnome-shell' ]
+modules = [ 'gnome-shell-using-gir-repository' ]
+# Enable this one to use introspection built from the stack itself
+# modules = [ 'gnome-shell-full' ]
 
 # what directory should the source be checked out to?
 checkoutroot = os.path.expanduser('~/gnome-shell/source')